From: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Date: Mon, 25 Jan 2021 21:39:32 +0000 (+0100)
Subject: gtkgstsink: Report allocation size even if no pool requested
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1~1^2~83^2^2~479^2~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=c7a7d0582a52f0109f3f534ae7ae7a1f4ff24274;p=gtk4.git

gtkgstsink: Report allocation size even if no pool requested

We can do that so we should.
---

diff --git a/modules/media/gtkgstsink.c b/modules/media/gtkgstsink.c
index 1fb6719ee4..7375525c60 100644
--- a/modules/media/gtkgstsink.c
+++ b/modules/media/gtkgstsink.c
@@ -172,6 +172,7 @@ gtk_gst_sink_propose_allocation (GstBaseSink *bsink,
   GstCaps *caps;
   guint size;
   gboolean need_pool;
+  GstVideoInfo info;
 
   if (!self->gst_context)
     return FALSE;
@@ -187,22 +188,20 @@ gtk_gst_sink_propose_allocation (GstBaseSink *bsink,
   if (!gst_caps_features_contains (gst_caps_get_features (caps, 0), GST_CAPS_FEATURE_MEMORY_GL_MEMORY))
     return FALSE;
 
-  if (need_pool)
+  if (!gst_video_info_from_caps (&info, caps))
     {
-      GstVideoInfo info;
+      GST_DEBUG_OBJECT (self, "invalid caps specified");
+      return FALSE;
+    }
 
-      if (!gst_video_info_from_caps (&info, caps))
-        {
-          GST_DEBUG_OBJECT (self, "invalid caps specified");
-          return FALSE;
-        }
+  /* the normal size of a frame */
+  size = info.size;
 
+  if (need_pool)
+    {
       GST_DEBUG_OBJECT (self, "create new pool");
       pool = gst_gl_buffer_pool_new (self->gst_context);
 
-      /* the normal size of a frame */
-      size = info.size;
-
       config = gst_buffer_pool_get_config (pool);
       gst_buffer_pool_config_set_params (config, caps, size, 0, 0);
 
@@ -212,12 +211,13 @@ gtk_gst_sink_propose_allocation (GstBaseSink *bsink,
           gst_object_unref (pool);
           return FALSE;
         }
-
-      /* we need at least 2 buffer because we hold on to the last one */
-      gst_query_add_allocation_pool (query, pool, size, 2, 0);
-      gst_object_unref (pool);
     }
 
+  /* we need at least 2 buffer because we hold on to the last one */
+  gst_query_add_allocation_pool (query, pool, size, 2, 0);
+  if (pool)
+    gst_object_unref (pool);
+
   /* we also support various metadata */
   gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, 0);